From 04ce93fe81e83a89a74770bff096e12f4b1b411a Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Thu, 27 Jan 2005 13:44:41 +0000
Subject: [PATCH] bitkeeper revision 1.1159.223.45
 (41f8f049ZJjSGVQ7S0Y7kGBwMIZfZQ)

No longer override target arch with ARCH but instead use TARGET_ARCH.
Xen now requires specification of TARGET_ARCH alone, not TARGET_ARCH
and TARGET_SUBARCH. Xen derives correct internal ARCH/SUBARCH components
automatically.
---
 Makefile       | 14 +++++++-------
 tools/Rules.mk |  4 ++--
 xen/Rules.mk   | 15 ++++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 094acb7fe4..73098aa3dd 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildc
 export DESTDIR
 
 # Export target architecture overrides to Xen and Linux sub-trees.
-ifneq ($(ARCH),)
-export TARGET_SUBARCH := $(ARCH)
-export SUBARCH        := $(subst x86_32,i386,$(ARCH))
+ifneq ($(TARGET_ARCH),)
+SUBARCH := $(subst x86_32,i386,$(ARCH))
+export TARGET_ARCH SUBARCH
 endif
 
 include buildconfigs/Rules.mk
@@ -42,8 +42,8 @@ install: xen checked-tools kernels docs
 
 # Only check for install req'mts on 'make install', not on 'make dist'.
 checked-tools:
-	$(MAKE) ARCH=$(ARCH) -C tools/check install
-	$(MAKE) ARCH=$(ARCH) -C tools install
+	$(MAKE) -C tools/check install
+	$(MAKE) -C tools install
 
 # build and install everything into local dist directory
 dist: xen tools kernels docs
@@ -57,7 +57,7 @@ xen:
 	$(MAKE) -C xen install
 
 tools:
-	$(MAKE) ARCH=$(ARCH) -C tools install
+	$(MAKE) -C tools install
 
 kernels:
 	for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
@@ -92,7 +92,7 @@ world:
 # clean doesn't do a kclean
 clean: 
 	$(MAKE) -C xen clean
-	$(MAKE) ARCH=$(ARCH) -C tools clean
+	$(MAKE) -C tools clean
 	$(MAKE) -C docs clean
 
 # clean, but blow away kernel build tree plus tar balls
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 2876c7eb61..2666f43842 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -4,12 +4,12 @@ XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
 
-ifeq ($(ARCH),x86_32)
+ifeq ($(TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386
 endif
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(TARGET_ARCH),x86_64)
 CFLAGS  += -m64
 LDFLAGS += -m elf_x86_64
 endif
diff --git a/xen/Rules.mk b/xen/Rules.mk
index c5d3405781..cf6972f097 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -6,14 +6,15 @@ perfc       ?= n
 trace       ?= n
 optimize    ?= y
 
-# Currently supported architectures:
-#  {COMPILE,TARGET}_ARCH    := x86
-#  {COMPILE,TARGET}_SUBARCH := x86_32 | x86_64
-COMPILE_ARCH    := x86
-COMPILE_SUBARCH := $(shell uname -m | sed -e s/i.86/x86_32/)
-
+# Currently supported architectures: x86_32, x86_64
+COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 TARGET_ARCH     ?= $(COMPILE_ARCH)
-TARGET_SUBARCH  ?= $(COMPILE_SUBARCH)
+
+# Set ARCH/SUBARCH appropriately.
+COMPILE_SUBARCH := $(COMPILE_ARCH)
+TARGET_SUBARCH  := $(COMPILE_ARCH)
+COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
+TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
 
 TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
-- 
2.30.2